Use the proper node type for placeholders in toolbars. (#151963, Olivier

2004-09-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type
	for placeholders in toolbars.  (#151963, Olivier Andrieu)

diff --git a/ChangeLog b/ChangeLog
index 9570e29752ad28b96cf63265c8c807e91ac97cc6..b6f82a3a2ac9179ed6c760e317f415d75adbbc7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type
+       for placeholders in toolbars.  (#151963, Olivier Andrieu)
+
        * gtk/gtkstyle.c (gtk_default_draw_expander): Draw expanders a bit 
        better.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9570e29752ad28b96cf63265c8c807e91ac97cc6..b6f82a3a2ac9179ed6c760e317f415d75adbbc7d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-09-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type
+       for placeholders in toolbars.  (#151963, Olivier Andrieu)
+
        * gtk/gtkstyle.c (gtk_default_draw_expander): Draw expanders a bit 
        better.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9570e29752ad28b96cf63265c8c807e91ac97cc6..b6f82a3a2ac9179ed6c760e317f415d75adbbc7d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-09-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type
+       for placeholders in toolbars.  (#151963, Olivier Andrieu)
+
        * gtk/gtkstyle.c (gtk_default_draw_expander): Draw expanders a bit 
        better.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9570e29752ad28b96cf63265c8c807e91ac97cc6..b6f82a3a2ac9179ed6c760e317f415d75adbbc7d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-09-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type
+       for placeholders in toolbars.  (#151963, Olivier Andrieu)
+
        * gtk/gtkstyle.c (gtk_default_draw_expander): Draw expanders a bit 
        better.
 

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 459f97102c6e7d5296e29233b7598502394efb8b..9a143c609f078b200df59052c9014ad57955e50f 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1632,7 +1632,7 @@ gtk_ui_manager_add_ui (GtkUIManager        *self,
          node_type = NODE_TYPE_SEPARATOR;
          break;
        case GTK_UI_MANAGER_PLACEHOLDER:
-         node_type = NODE_TYPE_MENU_PLACEHOLDER;
+         node_type = NODE_TYPE_TOOLBAR_PLACEHOLDER;
          break;
        default: ;
          /* do nothing */